From 963152a85a9dbfea926636fa9dfa2daeca6218ec Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 19 May 2019 17:49:07 +0000 Subject: [PATCH] size group: Make not subclassable Part of being more explicit about what we allow to be subclassed and what not. --- gtk/gtksizegroup.c | 4 ++++ gtk/gtksizegroup.h | 15 --------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 6cdba27907..ba87da3ae5 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -102,6 +102,10 @@ * ]| */ +struct _GtkSizeGroupClass +{ + GObjectClass parent_class; +}; struct _GtkSizeGroupPrivate { diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h index 6067f2c653..9e78ec0f81 100644 --- a/gtk/gtksizegroup.h +++ b/gtk/gtksizegroup.h @@ -29,11 +29,7 @@ G_BEGIN_DECLS #define GTK_TYPE_SIZE_GROUP (gtk_size_group_get_type ()) #define GTK_SIZE_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroup)) -#define GTK_SIZE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass)) #define GTK_IS_SIZE_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SIZE_GROUP)) -#define GTK_IS_SIZE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SIZE_GROUP)) -#define GTK_SIZE_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass)) - typedef struct _GtkSizeGroup GtkSizeGroup; typedef struct _GtkSizeGroupPrivate GtkSizeGroupPrivate; @@ -47,17 +43,6 @@ struct _GtkSizeGroup GtkSizeGroupPrivate *priv; }; -struct _GtkSizeGroupClass -{ - GObjectClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - GDK_AVAILABLE_IN_ALL GType gtk_size_group_get_type (void) G_GNUC_CONST; -- 2.30.2